Deprecate gtk_icon_info_load_symbolic_for_style

We might end removing it altogether since it is a bit silly to have
Since: 3.0
Deprecated: 3.0

diff --git a/gtk/gtkicontheme.c b/gtk/gtkicontheme.c
index da551e5e760795a30784bcc2a6d5b7dc466452ab..2211020c4fd15536d89493e666c52f8fcb3e5f71 100644 (file)
--- a/gtk/gtkicontheme.c
+++ b/gtk/gtkicontheme.c
@@ -3273,7 +3273,7 @@ gtk_icon_info_load_symbolic_for_context (GtkIconInfo      *icon_info,
                                          GError          **error)
 {
   GdkPixbuf *pixbuf;
-  GdkRGBA *color;
+  GdkRGBA *color = NULL;
   gchar *css_fg, *css_success;
   gchar *css_warning, *css_error;
 
@@ -3348,6 +3348,8 @@ gtk_icon_info_load_symbolic_for_context (GtkIconInfo      *icon_info,
  * Return value: (transfer full): a #GdkPixbuf representing the loaded icon
  *
  * Since: 3.0
+ *
+ * Deprecated: 3.0: Use gtk_icon_info_load_symbolic_for_context() instead
  **/
 GdkPixbuf *
 gtk_icon_info_load_symbolic_for_style (GtkIconInfo   *icon_info,

diff --git a/gtk/gtkicontheme.h b/gtk/gtkicontheme.h
index 07042ef35af59fcbf2812125db1846ffc4a803f2..9ee87e16f13ea99c5b0015e5d8f381ab687a7462 100644 (file)
--- a/gtk/gtkicontheme.h
+++ b/gtk/gtkicontheme.h
@@ -183,11 +183,13 @@ GdkPixbuf *           gtk_icon_info_load_symbolic_for_context (GtkIconInfo
                                                                GtkStyleContext  *context,
                                                                gboolean         *was_symbolic,
                                                                GError          **error);
+#ifndef GTK_DISABLE_DEPRECATED
 GdkPixbuf *           gtk_icon_info_load_symbolic_for_style  (GtkIconInfo   *icon_info,
                                                               GtkStyle      *style,
                                                               GtkStateType   state,
                                                               gboolean      *was_symbolic,
                                                               GError       **error);
+#endif
 void                  gtk_icon_info_set_raw_coordinates (GtkIconInfo  *icon_info,
                                                         gboolean      raw_coordinates);
 

diff --git a/gtk/gtkimage.c b/gtk/gtkimage.c
index ce0fcbef6a9ebdb043fd5f207b86a18327089c2e..184451ef239bbcdffbabea896b42bc57fddca64d 100644 (file)
--- a/gtk/gtkimage.c
+++ b/gtk/gtkimage.c
@@ -1469,15 +1469,15 @@ ensure_pixbuf_for_icon_name (GtkImage     *image,
                                          MIN (width, height), flags);
       if (info)
         {
-          GtkStyle *style;
+          GtkStyleContext *context;
           gboolean was_symbolic;
 
-          style = gtk_widget_get_style (GTK_WIDGET (image));
+          context = gtk_widget_get_style_context (GTK_WIDGET (image));
           priv->data.name.pixbuf =
-            gtk_icon_info_load_symbolic_for_style (info,
-                                                   style, state,
-                                                   &was_symbolic,
-                                                   NULL);
+            gtk_icon_info_load_symbolic_for_context (info,
+                                                     context,
+                                                     &was_symbolic,
+                                                     NULL);
           priv->was_symbolic = was_symbolic;
           gtk_icon_info_free (info);
         }
@@ -1544,15 +1544,15 @@ ensure_pixbuf_for_gicon (GtkImage     *image,
                                             MIN (width, height), flags);
       if (info)
         {
-          GtkStyle *style;
+          GtkStyleContext *context;
           gboolean was_symbolic;
 
-          style = gtk_widget_get_style (GTK_WIDGET (image));
+          context = gtk_widget_get_style_context (GTK_WIDGET (image));
           priv->data.gicon.pixbuf =
-            gtk_icon_info_load_symbolic_for_style (info,
-                                                   style, state,
-                                                   &was_symbolic,
-                                                   NULL);
+            gtk_icon_info_load_symbolic_for_context (info,
+                                                     context,
+                                                     &was_symbolic,
+                                                     NULL);
           priv->was_symbolic = was_symbolic;
           gtk_icon_info_free (info);
         }